updates per discussion on #257