Misc updates

Adding the commits from the previous borked PR. Do et now!