More changes... trying to tidy up