Lots of small tweaks, fixed collisions