Huge update, new game logic, cleaning up