Correct streams & add infinite streams