Updated documentation and TODO