Add some of Victor's suggestions.