changes from Jan 15, 2013 code review.  compile and unit tests NOT attempted.