Combat related features and fixes