Improve /me workings