switched to handlebars for templating + various improviments