more song name mapping and changes in the parser to support them