clean up some callback routing issues and other minor adjustments
draft docs