Fix up numbers, add new stream.