changed a few things for testing on laptop, adding possible controller support