Made fix to Multiple Targets bug - Maybe xD
Bunch of corrections!
Merge branch 'feature/Danny_1' into develop