Tweak collision detection
Final tweaks