added stuff

still bugs