Tested and fixed remaining issues