a bit more constness
fix typo leading to crash.
update TODO