fixes to fight2