A bunch of changes I'm too lazy to individualize