TODOs in HEAD and a example improved