Fixed Zone Factory and Zone model. Other small changes.