main - Exception backtrace, HTML EOL fix
Templates - Cleanup and macro support