fix mistakes and missed params