Some quick fixes of code that was sorting dict.keys() etc.