Typos.
Further typos.
Correct title
More reliable buffer position handling.