fix template parsing
trivial changes