Fix a bunch of stuff
Fix merge