various cleanups + fixes
Merge pull request #1455 from dengemann/release_misc

FIX: various cleanups + fixes