more minor changes in Fight