Templating fixes, added timestamps.