t117 - misc updates