Added config documentation
Fixes for refactored code