updates per 18Dec comments