Removed some Todo's, updated documentation

- fixed missing initialization of index variable