Fixed some issues related to parsing streaming data. Commented out some possible fixes for the future.