Add comments, make height conservation less brittle