Small updates to comply with the initial pull request feedback plus some other details.