CallbackHelper to proper place
Small documentation improvements
Some documentation improvements.