fix for matthias commit (missing FileLoader), rewrite of mspl stuff