minor updates after testing.  Also updated comments as requested