removing debug + debugging streamServer
merge conflicts