Added brackets on single-line conditionals
Added brackets again
Changed some default values
Changed some default values