general tidyup