Adds ffind and updates a couple others