Fix the Helper wait functionality, add loop repeats control