ok? Fixed yet more errors