Various Updates

Miscellaneous changes to the code.
Enabled NuGet package restore.