fixes to fight 2