Stuff I missed

Also, SaveGenerator will load files!