tweaks and progress on doc gen