Bug fixing
Settings for production