Loads to update but there's no time, exams week :( Boohoo.

Will update on friday i guess