Merge pull request #796 from leider/master

cleanups (see below)