fixing still bugs