Brawler, Slayer, Swashbuckler fixes

Lots of changes.