a little more clean up and fixed an error on zoneing