added a few missing "| _ => NONE" patterns