Fixed some saving/loading bugs.
Renamed files.