EmitMessage implemented
Bug fix comma missing