Merge pull request #706 from leider/master

cleanups (see below)