fixed a few typo and added a TODO note