updates from pr comments