Improve zooming and other fixes