Further fixes to templates and parser.
Temporarily disabled XML parser (!!)