Fix #112. The AST was correct but the printing was not
Fix #113
Updated Windows batch file
Updated DDoc, made template order more consistent.