Mood categories, small fixes
Mood Category, merge and small fixes