Simplified stream syntax + bug fixes