Fixed reverting bug

I hope. Custom space centres code temporarily disabled and a previous
bug fix slightly reverted. It's testing fine here but I don't trust it.
Tidy up before rolling release
Fix snap to surface.