Updated the Parser and changed Stream.java correspondingly. Plus minor improvements on Stream.java