minor fixes and adds template support

Signed-off-by: Alex Roth <alex@coschedule.com>