Some general fixes
Merge branch 'master' of https://github.com/u11156342/Cos-301-Main