final tidying up for release 0.12.0