Added some new configuration options
Minor fixes
Minor fixes