Misc updates

Bunch of random stuff