resolved more errors