Fix typo in bib
Fix some typos and add some comments in some todos