Changed form of constants in params, other tune-up