working controls, controller detected instead of hardcoded
fixes