Fixed saving and loading (and refactored a bunch!)
Update readme