Various changes that I don't 100% remember =/