corpus and other tweaks