Fix camera and tile collisions
Fix camera and tile collisions
Tweeks after merging