impl: text edits and fixes