Minor updates based on Tyson's, Peter's, and Jeff's feedback.
Second attempt to checkin based on variuos feedback
Merge pull request #1633 from Selcin/Oct14sgt

Oct14sgt