improved TODO messages