Made some minor adjustments. Getting ready to package item for Nuget.