fix clear stims, output wait and align