add todo and fix conclusions