fixed remaining errors