Changed FlexFuel and DriveMode to Input Modes

and bug fix