Added /who and did minor refactoring