C# and C++ corrections added