Tidying up for 1.0 release.