tidy up minor issues