Corrected at least one bug somewhere, I'm almost certain of that.