fix collisions and map eliminate map re-draw