Cobbled collision system together, plus nicety tweaks.