Massive cleanup and refactoring, added /nick and /realname