Remove comment
Add info to the output and a better fixme