removed a TODO, misc small changes to text