fixed a lot of stuff
fixed a lot of stuff