"bug fixes in emotion class"