Some small changes with saving stuff
Mostly Javadoc
Merge pull request #256 from HoltMaki/master

mostly documentation