cleanup and fixes esp. T702