Small template fixes, adds a ShortTrace overview