Update comments to use lexicographic order
Add TODO items