Fiexed typos and more comments