text edits and bug fixes