update todo
more sophisticated stats