Revert "Revert "+ mp3 loading from disc / cleanup""

This reverts commit caec80139ca1a6538c9d2ac36a2bf8959e7d5eea.