Fixed combat, more tweaks