Corrections based on pull request; improved comments