progress commit

a few tweaks, making sure I get the updates from others
Merge branch 'master' of https://github.com/livingjigsaw/OOP_adventure_project