fixed collisionFunc bug
moved the collision state update for entities to one method
removed debugging line