Changes to zoom calculation, minor changes