Typos in message strings.
Some TODOs added to comments