Oh, by the way: ditching Weaponmaster on the Swordmaster is totally fine. You can replace it with Fortified Mind so that ghosts can’t spook your guy away. You could ditch Rotation, too, but I love that skill.
EDIT: Oh, and here’s Gisbert the Graceful from a WAY older patch.
![](http://i.imgur.com/Q7o2aDn.png)