Combat cleanup + shiled command fix