fixed remaining issues in #97