Using more generalized zonedoor tool.
improved debug output.
Fixed problems with zonedoor.
Merge branch 'test' into dev