Various fixes, work on getting the stream to operate