fixed a bunch of stuff. Almost done