minor improvements. need to add back all of the things the old template engine supported then delete it.

minor improvements. need to add back all of the things the old template
engine supported then delete it.