stability checkin:  changes pass old tests, now to Joes env issues.