Bug fixes

Main game mechanic done
refactoring needed
collectables and weapons to be added