- fixed remaining errors