remove zones, repair gcd check and other fixes