first series of changes from pr-comments