Fixed a bug and removed a parameter
Removed streaming support for now...
Rearranged the parameters code