Improved settings documetation and sample
Fixed minor issues