3 major bug fixes with repeats