Documentation update and adding TODO list