add zoom support; bug fixes