Wrapping up final zoom/scale issues