bringing in Toby's fixes for display results by user to the master branch.