Release UC16
Various tidies.