Reformat Code, and some improvements to Javadoc and a bit of tweaking to Commands
Improved typing in JSON files, using TypeTokens.