I'd suggest, at least until you've sorted out the NPC system, to remove the negative (and thereby pointgiving) traits "Brooding" and "Short Tempered". they seem only to exist to give people some extra positive traits, and I cannot resist the temptation.