all cases passing

with mnay hacks...