A few more changes. Soon able to push a release.