Fixing typos and adding some comments