Changed default values to suit new porpoise

Changed default values to suit new purpose