update somes with Rex's suggestions