Prepared the corrections in my github branch - will create a PR once the current pending changes are accepted.