many changes and updates, new tags and templates