update to include stream.cpp and curve related