final tidying up for release 1.1.1