NAPA: some more consonants and some minor fixes.