some doc
FF fixes
refactoring