I can't tell if your first post issue is fixed.

I did finally just fix the off-by-one, though.