various heading and related style fixes