pan is now working, though it isn't as nice as we might like
moved a todo comment
initial pinch-zoom support
fixed pinch-zoom