Fixed a couple of bugs
Merge https://github.com/MattsJavaTutorials/SrcCode---MattsJavaTutorials