corrections from scoder