More config corrections, fixed bug with bumper/stick mapping to same keys