various updates over time. and some fiddling.