Added Zoom #beta
Minor bug fixes