working on #742 - minor fixes