few mods to fsm