more cleanup, still bugs