add todo and minimal fixes