Thanks!
Would you believe that #2 was how the game functioned until Sunday morning? Looping actually used to be a big part of the game, but I wanted to keep a small map size and looping actually didn't work well, especially for the later puzzles. I removed it Sunday morning and re-worked everything and it ended up much better.