massive tagging, template cleanup, typeahead fixes