Fixes

Fixed some little things in the code and added GameState