Bunch of updates that I already forgot about