Style improvements plus work on TM draft