Tweak XY-wall logic
Update to latest Calx