+1 to adding non-combat XP to the list please! There are some great interactions to be had with NPCs, and players should be rewarded for resolving non-combat situations.