Minor typos fix
More robust implementation of single-ch shortcut