code changes - steve
code updates

removed previously commented out code, removed testing dialogs