Several todo corrections for documentation