changes around the defaults to work a bit better