Better example, update todo, comments