Fixed some stuff, broken other things :/
Merge remote-tracking branch 'refs/remotes/origin/master'