Fixed ffs
Minor changes