some more errors fix