Various fixes, NuGet packages added.