diff --git a/PSHTML-AD.ps1 b/PSHTML-AD.ps1
index 0df6922..51b75e9 100644
--- a/PSHTML-AD.ps1
+++ b/PSHTML-AD.ps1
@@ -342,7 +342,7 @@ foreach ($DomainAdminMember in $DomainAdminMembers)
 }
 
 #Get Enterprise Admins
-$EnterpriseAdminsMembers = Get-ADGroupMember "Enterprise Admins"
+$EnterpriseAdminsMembers = Get-ADGroupMember "Enterprise Admins" -Server $ForestObj.SchemaMaster
 
 foreach ($EnterpriseAdminsMember in $EnterpriseAdminsMembers)
 {
@@ -789,16 +789,14 @@ if (($OUTable).Count -eq 0)
 
 #OUs with no GPO Linked
 $obj1 = [PSCustomObject]@{
-	
-	'Name'  = "OUs with no GPO's linked"
+	'Name'  = "OUs with no GPOs linked"
 	'Count' = $OUwithnoLink
 }
 
 $OUGPOTable.Add($obj1)
 
 $obj2 = [PSCustomObject]@{
-	
-	'Name'  = "OUs with GPO's linked"
+	'Name'  = "OUs with GPOs linked"
 	'Count' = $OUwithLinked
 }
 
@@ -1116,14 +1114,23 @@ $ComputersProtected = 0
 $ComputersNotProtected = 0
 $ComputerEnabled = 0
 $ComputerDisabled = 0
-$Server2016 = 0
-$Server2012 = 0
-$Server2012R2 = 0
-$Server2008R2 = 0
-$Windows10 = 0
-$Windows8 = 0
-$Windows7 = 0
-$Server2012R2 = 0
+#Only search for versions of windows that exist in the Environment
+$WindowsRegex = "(Windows (Server )?(\d+|XP)?( R2)?).*"
+$OsVersions = $Computers | Select-Object OperatingSystem -unique | ForEach-Object {
+	if ($_.OperatingSystem -match $WindowsRegex ){ 
+		return $matches[1]
+	} elseif ($_.OperatingSystem -ne $null) {
+		return $_.OperatingSystem
+	}
+} | Select-Object -unique | Sort-Object
+
+$OsObj = [PSCustomObject]@{}
+
+$OsVersions | ForEach-Object {
+
+	$OsObj | Add-Member -Name $_ -Value 0 -Type NoteProperty
+
+}
 
 foreach ($Computer in $Computers)
 {
@@ -1164,47 +1171,11 @@ foreach ($Computer in $Computers)
 	
 	$ComputersTable.Add($obj)
 	
-	if ($Computer.OperatingSystem -like "*Server 2016*")
-	{
-		
-		$Server2016++
-	}
-	
-	elseif ($Computer.OperatingSystem -like "*Server 2012 R2*")
-	{
-		
-		$Server2012R2++
-	}
-	
-	elseif ($Computer.OperatingSystem -like "*Server 2012*")
-	{
-		
-		$Server2012++
-	}
-	
-	elseif ($Computer.OperatingSystem -like "*Server 2008 R2*")
-	{
-		
-		$Server2008R2++
-	}
-	
-	elseif ($Computer.OperatingSystem -like "*Windows 10*")
-	{
-		
-		$Windows10++
-	}
-	
-	elseif ($Computer.OperatingSystem -like "*Windows 8*")
+	if ($Computer.OperatingSystem -match $WindowsRegex)
 	{
-		
-		$Windows8++
-	}
-	
-	elseif ($Computer.OperatingSystem -like "*Windows 7*")
-	{
-		
-		$Windows7++
+		$OsObj."$($matches[1])"++
 	}
+
 }
 
 If (($ComputersTable).Count -eq 0)
@@ -1216,77 +1187,16 @@ If (($ComputersTable).Count -eq 0)
 	}
 }
 
-#Data for TOP Computers data table
-$objULic = [PSCustomObject]@{
-	
-	'Total Computers' = $Computers.Count
-	"Server 2016"	  = $Server2016
-	"Server 2012 R2"  = $Server2012R2
-	"Server 2012"	  = $Server2012
-	"Server 2008 R2"  = $Server2008R2
-	"Windows 10"	  = $Windows10
-	"Windows 8"	      = $Windows8
-	"Windows 7"	      = $Windows7
-}
-
-$TOPComputersTable.Add($objULic)
-
 #Pie chart breaking down OS for computer obj
-$objULic = [PSCustomObject]@{
-	
-	'Name'  = "Server 2016"
-	"Count" = $Server2016
-}
-
-$GraphComputerOS.Add($objULic)
-
-$objULic = [PSCustomObject]@{
-	
-	'Name'  = "Server 2012 R2"
-	"Count" = $Server2012R2
+$OsObj.PSObject.Properties  | ForEach-Object {
+	$GraphComputerOS.Add([PSCustomObject]@{'Name'  = $_.Name;"Count" =$_.Value})
 }
 
-$GraphComputerOS.Add($objULic)
-
-$objULic = [PSCustomObject]@{
-	
-	'Name'  = "Server 2012"
-	"Count" = $Server2012
-}
-
-$GraphComputerOS.Add($objULic)
-
-$objULic = [PSCustomObject]@{
-	
-	'Name'  = "Server 2008 R2"
-	"Count" = $Server2008R2
-}
-
-$GraphComputerOS.Add($objULic)
-
-$objULic = [PSCustomObject]@{
-	
-	'Name'  = "Windows 10"
-	"Count" = $Windows10
-}
-
-$GraphComputerOS.Add($objULic)
-
-$objULic = [PSCustomObject]@{
-	
-	'Name'  = "Windows 8"
-	"Count" = $Windows8
-}
-
-$GraphComputerOS.Add($objULic)
+#Data for TOP Computers data table
+$OsObj | Add-Member -Name 'Total Computers' -Value $Computers.Count -Type NoteProperty
 
-$objULic = [PSCustomObject]@{
-	
-	'Name'  = "Windows 7"
-	"Count" = $Windows7
-}
+$TOPComputersTable.Add($OsObj)
 
-$GraphComputerOS.Add($objULic)
 
 #Data for protected Computers pie graph
 $objULic = [PSCustomObject]@{