cleared a few more errors