Increased zoom timeout
A few small tidy ups
Merge