Massive update

ok, a two for one update today as I couldn't post anything this morning: (feel free to leave a comment btw)