Big changes after mark's feedback

loads of edits through the whole cv