PowerDot Emotion Fix- General fixes