Beta 7 Fixes, making the game harder and refactoring code