more minor bug fixes
Merge branch 'master' of https://github.com/Marcial1234/COP3503-Project