@ mentions, other bugfixes