Fixed some stuff, still bugs