typos and a cleanup, with getting code upto date with UthandoCommon 3.1.1