added walls and fixed collisions