More cleanup and corrections, need for which discovered while preparing video of NuGet package