Fix fhom bug and f naming in modelling scripts