fixed a bunch of junk