general tidy up..