updates for setuphandler and Documentation