Some fixup's, some tests.