some uncommented changes from long ago