fixing a few outstanding features/bugs
Merge branch 'master' of https://github.com/Johnley/3000Final