fixed a bunch of little shit