update todo, merge things together