More fixes to heading and anti-pnum-overlapper