fixed remaining issues.