fixed FF not leaving FS, general OSMF issues