cduvall: small changes