Changed Controls

No more role swapping.
Small changes to fix code