all the v0.1.2-jtv changes, rebased on master