Added a collisions method, fixed map block assignment