added the TODO message in one more place, added the ui components messages