some more refactoring§
Merge branch 'master' of github.com:samuelsmal/ss_fs14