Removed some todos
Merge remote-tracking branch 'origin/documentation' into documentation
Typo