working on #22, minor housekeeping