fixed more errors