Edited some small things
Fixed some minor merge conflicts