Fixing an off-by-2 error
Putting it back together again
Get mapping scheme case right