a bunch of tweaks, fixes, starting on spikes