Refactored CommandHelpers, upgraded Mercenary