ccoffee fixes
removed todo
???