Made some changes over the last couple of days, can't remember everything.