mostly some renaming that i forgot to commit
Merge branch 'master' of https://github.com/MartinMedMitten/Dart