Fix comment layout
Update to-do list