Fixed comment
Generalize machanism handling branches to support switches over unknowns + fixes