Minor cosmetic schema changes + TODO list udpate.