Minor commit, removed a lot of TODO in code and clarified some commentaries