fix fiat selection and timer