Added fix (I think) that solves the "wrap around" problem! Testing...