change defaults and minor style