minor adjustments from reviewing duerig's latest changes