Major changes to the handling of music sources

Major changes to the handling of music sources and also various bug fixes

Signed-off-by: Simon Post <simon.post@cpw.co.uk>