refactoring + /me support

fixes #67