More control tweaks, correct collisions