fix mistakes + finish simul