Re-importing some late modification only present in my repo.

+ typos corrected in generic sources.