adding changes to FST
fixed minor issues