more 'performant' echoing, addition of some TODOs