Fix seethru faces and minor cleanup.