add a TODO and remove dead code
highlighting of current parameter in context info, and refactorings