Fixed jumping right

Jumping right was incorrect
Fixed some bugs with the edge cases

Found some bugs for the edge cases