fix wrong mask and move defn, add UTF-8 description