update todo and some formatting