Minor tweaks. Added Mood.None and a couple contracts.