final updates for #7