Fixed more errors