minor fixes and cleanup, see #88