Updated C# project

Various improvements