removed more errors