Changed some defaults