last minute fixes closing in on the release

Tests seem too work as expected.