Gajillion bugs fixed

From streaming.