tidying up with minor changes/corrections