emokit fix
[Jackie] Misc updates