cleaning again, but still bugs