updated documentation
reorganized settings