Fix IdCode parser
Fix song / movement problem. Solve part of #156
Fix sourceId retrieval. Solve part of #156
Small fix
Small code improvements