Changed defaults a bit