More fixes to zooming, which layers to show and when, etc