textual fixes and added a todo