Parameter simplification. Fix some errors