bh: more thunderstorm changes.