Cleanup and fixed fighting