Add comments, update todo