Nicer quotes, clean up two transitions, fix a typo