pre -02 sub; another round of fixes