fixed remaining issues