Adding more settings and fixing settings description