Sorry, I guess I misremembered things. It never used the wrong number of screens per map. Maybe I'm thinking of something else.

So I guess it's just the bounds checking that needs added now.