fixed a bug where the UI.display was showing the wrong user; also got rid of commented out lines