rename some vars
added user sorting