Fix up examples and add Csharp extension methods