Added streams and fixed a few things