fixed some more errors