v. 0.7, inline templates both in Contemplate and in code, minor updates