more work on pan zoom support