minor fixes based on feedback from Michael Catanzaro