Updated documentation and todo