Walls bug fixes, some cases still not accounted for