add zone and minor fix