Fixed last bugs in saving/loading. Closes #40.