fixed collision, added game states