Changed some default parameters and fixed traces u, i