bunch of cosmetic changes to the combat library, more yet to come!