save counts & reorganize a little