Adds comments feature and fixes Handlebars templates