address more comments