Makkot 15: When a Positive Commandment Corrects a Violation

A difficult daf. When a combination of mitzvot (positive and negative) and the violation thereof lead to lashes vs. when the result is no lashes. Plus, Rabbi Yochanan changes his mind. Plus, the case of a man who rapes a woman, has to marry her, can't divorce her, and then does divorce her - what happens to him? Also, how the time factor to do a positive commandment is relevant to his rectifying this situation.