PB+SWMH fixes
Fighter trait fix
DIP/fighter traits fix
Merge pull request #185 from Meneth/beta

Beta