Bunch of changes I was too lazy to commit individually