Lots of bug squashing, revived saving/loading