in debugging found more issues also patching for Zflag fall through cases