Added a number of fixes
Merge branch 'master' of github:chewett/COMP6205