[uontt] improve week formatting (not complete yet); tidy up