further cleanup of user guide, pre merge