...
added song templates and fixes