Add back and deprecate most of the members of PrimarySkillType (commit: 29613bc)
Shorten notes (commit: cfdcc9d)
Update SkillTools (commit: be44c0e)
Fix infinite loop (commit: 323f496)