Fixing typos and adding some comments

* All comments start with "NK:"