Adding User Testing and Minor changes