[Introduction] Add todos and fix minor mistakes