fixed up collision detection to deal with entities and fixtures