Corrected logic in overlay.offsets
Merge branch 'puzzle'