misc edits to this so-called bug-fix