[UPDATE] added top inviter, some code cleanup