more errors fixed