changed some instances where username was used instead of first and last
changed ordering to firstname in places where username or lastname was used