corrects a bad iterator upper bound, fixes multiplication annotation drawing.