Added to-do section and small rearrangement.