some more comments from Marti's feedback added