some last min changes to tidy