r769

Numerous fixes to timing, collision and performance tweaks.