Updated todo and some other code changes.
It is now ready to be released