further improvements on r{a,o}m