Updated more stuff
Fix merge issues