FIxed a lot of stuff
fixed everything