reworded mashup templates
added logging