Mostly just fixes indent
Hacks at space jumping
corrections to work better with org mode