3p Services c# updates and bug fixes