updated SongParser functions to match spec

@fmmoret