updates for inclusion of freely drawn surface, and Typescript 1.3