various edits to 2866dd45d92cdc2dea59c861c0893b686bfcafd8.