updates per 22Dec comments