Documentation changes
Better handling of settings