more errors solved