more TODO's added

more TODO's added to the script