Cosmetics + added Q NuGet pkg (should have been in last commit)