some more fixes
valid annex calculation