fixing Toshiba patch; minor comment changes