Fixed tho primitive types for C++ output.
Added support for stringing all the output together.