Added AXFR checks and bug fixes