Incorporate another suggestion by Marta.
Fix typos and final commit.