Much tidying up, most references now added