Dr. Kaiser's text edits and bug fixes