more fixes for combat and gathering