Made MapEmotion avmap function, and other small changes.