Reworked the screen wrap system to also manage stopping at the edge of the screen.