A bunch of changes, too lazy to split them out