Some rework and remaining emotes