update keys
fix mentions