update todo + very small code improvements