fixed a bunch of stuff woot