Issue 104, fix typos, simplify "unless/otherwise" construct