Added label, removed time from dialog.

Other minor changes. Code has some comments that need to be removed.