improved gamepad and map fill in