Improved TODO script.