clean tables, ff bug fix