a few bits tried to escape, but we caught them
 assorted changes