fixes to FM model