fixup and add a couple more assertions