minor changes and adjustments for ff