3x updates, 5x new :)

Fingers crossed this pull's correctly :D