username added, exiting functionality improved