Refactgoring
Stream implementation fixes
1.2.0
Huge refactoring