Changed a bunch of last minute stuff
Fixed merge conflicts