Ok, edits attempted, everything I changed/added I put in bold so you don't need to read through absolutely everything again. I think I managed to get everything you referred to but I'm happy to make more changes if there is something I've missed.