Fix weird collision artifacts on right wall
Simplify filling rects