Init stream dicts when everything is okay
Improve parser

Most useful commit message in the world