added additional information and punctuation
merged in upstream changes