more fixes

Fixes #74