Improved fight behavior