added stuff
Merge remote-tracking branch 'origin/Rob-branch'
fix for the controls errors
merge fixed