general: fixed missing breaks, cleanup, refs #107