Minor cosmetic changes
Adding configuration settings