Fix some bugs, add @mentions.