fixed #5, began refactor of StreamFragment as it's gotten way too messy.