Fix org heading slant
General cleanup