Some improvements on cowboy.