working on fixes, doing some todos
Merge branch 'master' of https://github.com/floAr/ADG_Scarlet_Gamma