Big tidy up and additions