fixed a few more errors