Improved some default settings