Improved documentation and fixed one setting control