GSW: some tweaks to the verification section.