just some minor clean-up, table headers, misc