Changed some default parameter settings