Xbox controllers now working
merged code
fixed resetting