Small Upgrade And Zoom Fix