minor updates, changed TO_DO items