Fixed minor errors

Saving/loading still doesn't work needs to be debugged