more TODO update and tiny style fix