diff --git a/nefed.xml b/nefed.xml
index 56897ff163fdd0a85872f3f1089757f3d2477521..5489aae711816176dc09f5cbc35d46a8c8706ddc 100644
--- a/nefed.xml
+++ b/nefed.xml
@@ -1357,155 +1357,229 @@
             <EmailAddress>amp@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
-    <EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_ca0d422558ceb1cc653adb62c4c9695003f382a2" entityID="https://emststsc.nebraska.edu/shibboleth">
+
+    <EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+                      ID="_ca0d422558ceb1cc653adb62c4c9695003f382a2"
+                      entityID="https://emststsc.nebraska.edu/shibboleth">
         <Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-            <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512" />
-            <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384" />
-            <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224" />
-            <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512" />
-            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384" />
-            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256" />
-            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224" />
-            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512" />
-            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384" />
-            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" />
-            <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256" />
-            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1" />
-            <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
-            <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1" />
+            <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+            <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+            <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+            <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+            <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+            <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+            <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+            <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
             <mdrpi:RegistrationInfo registrationAuthority="https://nebraska.edu/nefed" />
             <mdattr:EntityAttributes>
-                <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+                <saml:Attribute Name="http://macedir.org/entity-category"
+                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
                     <saml:AttributeValue>
-                        https://nebraska.edu/category/registered-by-nefed</saml:AttributeValue>
+                        https://nebraska.edu/category/registered-by-nefed
+                    </saml:AttributeValue>
                 </saml:Attribute>
-                <saml:Attribute Name="http://shibboleth.net/ns/attributes/releaseAllValues" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+                <saml:Attribute Name="http://shibboleth.net/ns/attributes/releaseAllValues"
+                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
                     <saml:AttributeValue>
-                        unNUID</saml:AttributeValue>
+                        unNUID
+                    </saml:AttributeValue>
                 </saml:Attribute>
             </mdattr:EntityAttributes>
             <mdui:UIInfo>
                 <mdui:DisplayName xml:lang="en">EMS
-                    Test Environment for State Colleges</mdui:DisplayName>
-                <mdui:Description xml:lang="en">EMS Test Environment for
-                    State Colleges</mdui:Description>
-                <mdui:InformationURL xml:lang="en">https://its.nebraska.edu</mdui:InformationURL>
+                    Test Environment for State Colleges
+                </mdui:DisplayName>
+                <mdui:Description xml:lang="en">
+                    EMS Test Environment for State Colleges
+                </mdui:Description>
+                <mdui:InformationURL xml:lang="en">
+                    https://its.nebraska.edu
+                </mdui:InformationURL>
                 <mdui:PrivacyStatementURL xml:lang="en">
-                    https://its.nebraska.edu/policies-processes/idm-privacy-policy</mdui:PrivacyStatementURL>
+                    https://its.nebraska.edu/policies-processes/idm-privacy-policy
+                </mdui:PrivacyStatementURL>
                 <mdui:Logo height="85" width="141" xml:lang="en">
-                    https://scheduling.nebraska.edu/emswebapp/content/custom/EMS32.png</mdui:Logo>
+                    https://scheduling.nebraska.edu/emswebapp/content/custom/EMS32.png
+                </mdui:Logo>
             </mdui:UIInfo>
         </Extensions>
-        <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+
+        <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol
+                                                     urn:oasis:names:tc:SAML:1.1:protocol
+                                                     urn:oasis:names:tc:SAML:1.0:protocol">
             <Extensions>
                 <init:RequestInitiator
                     xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
                     Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
-                    Location="https://emststsc.nebraska.edu/Shibboleth.sso/Login" />
+                    Location="https://emststsc.nebraska.edu/Shibboleth.sso/Login"/>
                 <idpdisc:DiscoveryResponse
                     xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
                     Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                    Location="https://emststsc.nebraska.edu/Shibboleth.sso/Login" index="1" />
+                    Location="https://emststsc.nebraska.edu/Shibboleth.sso/Login" index="1"/>
             </Extensions>
-            <KeyDescriptor>
+            <KeyDescriptor use="signing">
                 <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
                     <ds:KeyName>
-                        nesisemstst.uncsdom.uneb.edu</ds:KeyName>
+                        nesisemstestsc.nead.nebraska.edu
+                    </ds:KeyName>
                     <ds:X509Data>
-                        <ds:X509SubjectName>CN=nesisemstst.uncsdom.uneb.edu</ds:X509SubjectName>
+                        <ds:X509SubjectName>
+                            CN=nesisemstestsc.nead.nebraska.edu
+                        </ds:X509SubjectName>
                         <ds:X509Certificate>
-                            MIIEGzCCAoOgAwIBAgIJAKwW2Qq509LuMA0GCSqGSIb3DQEBCwUAMCcxJTAjBgNV
-                            BAMTHG5lc2lzZW1zdHN0LnVuY3Nkb20udW5lYi5lZHUwHhcNMTgwNjA4MTYyMDI1
-                            WhcNMjgwNjA1MTYyMDI1WjAnMSUwIwYDVQQDExxuZXNpc2Vtc3RzdC51bmNzZG9t
-                            LnVuZWIuZWR1MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0825jO+G
-                            tMlLVDYAgBCtCf8GdctDrKTZcvzYifiO1hMaCOSNi/gHSxqRVIjQa7l06T+BDQW4
-                            Pjyhg0jU2x/FrdCHUUJo6i7PnaCFJy0WpXsvQr8KbS3RZCTT4o1xohijckdzcQSi
-                            QGSAmGgBzNJkFV1dZD6VJxybeHdPKpHntBNveB/6CNMqHOuzxokGJ6NKHuK3fzX6
-                            VRyox3s56xu/LTrrA5Kz3VrVQyeKIKrTpBGU2YBbDD51DnKoqOgrMghQs/51NAIo
-                            Lyz+E4Bqbi2VuqJVv0UH/5+syorTtpNcs44QKDrU5lfAQDU6dvZinr/K+z0bezwv
-                            Qcr3IBYgl4tsM0089wM0gNyJNoleETnH7yEKi4ihklCghkw7EcauwdfvqtiBOa4m
-                            98kHh6pfoYnyYrJbDBbHN0zFvLGdPrymJqWoWJsFSnYGVyBSJGlXFD11YR0v+2cA
-                            P96tkmcj4qFVBCbHavF8ODBALKiXNe1bxHCWVQR7VqcJFzKjBymp4cpRAgMBAAGj
-                            SjBIMCcGA1UdEQQgMB6CHG5lc2lzZW1zdHN0LnVuY3Nkb20udW5lYi5lZHUwHQYD
-                            VR0OBBYEFB//9JK1fzahS+Mh9FbCJ51S5QooMA0GCSqGSIb3DQEBCwUAA4IBgQDI
-                            ZaWGQmryWn87UYqNTgXI2FW4U7T73/VY1QFksMguvOUoVB0qyXOs1NMPMTPPGCT2
-                            XZn6D1Ag8J/hqX9e8hrozbL1iNNzs+0TxdExYBX8vTRuAb6ypT2oug9Q7SYeRpIl
-                            8bUhn+sF65UIuAowK4DU13L0sv7K/hv8WJrTBhJNlmkmO/L4I1DF2ez0u/Cf5Z99
-                            mfKUMOkyqN2xoEjZgwn0ZQYjg5CjLeZY+HGbOEyVrNNN6ZWVfPwrzTrXuLtcl9zT
-                            P4Q2cFZNd64NyR+JEozn3Mu6SfwIigl/adggueHp7V/QxuXDY9AcJscV402e8wdq
-                            T1A7ecCYKlPR1eBT031ylYFTh9W9bOgJRYbok52pj0rVwdnfWLOb5ulzaj7hODeC
-                            TqnvRZAYwkBKo2eDEZHptWbVc07U6+zHDf5Jbt8nK0IaS1/LiXnzsWFdtd0UOVDc
-                            oydKXrLNM7QkJiupRYeBQnPlPMFWFDZMukJHAPJ86cHJ6ZrqdLHJZNYh85m5QJI=
+                            MIIEMjCCApqgAwIBAgIUBa3Mqf6t3FLNgFpELUXA1tEqRNgwDQYJKoZIhvcNAQEL
+                            BQAwKzEpMCcGA1UEAxMgbmVzaXNlbXN0ZXN0c2MubmVhZC5uZWJyYXNrYS5lZHUw
+                            HhcNMjQxMjA0MjEzMDQxWhcNMzQxMjAyMjEzMDQxWjArMSkwJwYDVQQDEyBuZXNp
+                            c2Vtc3Rlc3RzYy5uZWFkLm5lYnJhc2thLmVkdTCCAaIwDQYJKoZIhvcNAQEBBQAD
+                            ggGPADCCAYoCggGBAJxNpsJHu3cExEPgGyPxBaJASq/NRoviSHJL9UpTrfat2A6T
+                            7Oj4mOPdYnMhoIymp5FNgUidXYCFTg3Yfst3qaUUjGDRjKNcKfPoAkZfm0jUOdNC
+                            UL4XtlE/QBurf2szb+YDHtdbGE64tzf/jJiuLkQabzhL4K5/RFl7G8rm/gTbaN85
+                            bCGOqpaMpWJHcYHrIoX3Pw7fdMsg0ugnTX0m3UrA1+Lb8v7bItuiFKM3TO3u+4RR
+                            LeWhlizB78EP8Ph6VOvTd81bXhQI497yoiwfp+vGJEi84qLAO8D7egtOU+KllN08
+                            p7Og95TEl7hr1cqAmuSYwZ5ZnFy3QoajfNavmBuDEaFkEANLtIbdsUUt7yeGx8e7
+                            s0c4aN4cdE3BRBrxdMGQFCv83oDz9YuKicqWhVGhyk8UqoQJjUYmBf10UnwD1cF0
+                            ppOz5gFyDW2nUR5oOwATry08u0/QgN4of78MSvAMbATofuITb77Cn7/l4h4eaYFr
+                            UHsk5AZdXzi/EwuoAQIDAQABo04wTDArBgNVHREEJDAigiBuZXNpc2Vtc3Rlc3Rz
+                            Yy5uZWFkLm5lYnJhc2thLmVkdTAdBgNVHQ4EFgQU0FvTNbUsltzBXu9JeZjQFJPE
+                            NJYwDQYJKoZIhvcNAQELBQADggGBACqqUxAVfL5l9wcyZmveMaYBmgheEwj7Asy5
+                            Vb3onXEXNePYfeqLjZDVWbidlBf4udNsRk3RhACtr31c33/Ha380o4ZGcsvSqi/+
+                            DaEHnNDRdWLvqEIUY0o538loAVPHJz1b6YPmenfQWJSN/rTXL7PVSWWT8Dl5PPun
+                            OdGs3QwJfRzFXNKe4kM8Pf43x+DSFraTvPKrQV7SNOnykQoWabowFANVKm4Bjgwz
+                            w9mL+0C31QQiM1lkZvdmeLh5bxuyRMpi24mVK8RGcnzQhSY/8vbpBsTv48XKdUb+
+                            xjh90tux/lcg69yyvxMy9Ae5SPpQrBlPfgUYN9mXxouOEi2vS1E/7GEM6wVfi1jC
+                            38fUCJPvjZSOLb0fCioJzZViJ2HeLFdDzg+Bec1Nr1O5KKFyClXR4yQLOUqQS5Rz
+                            sLwrudQIcVHScXykbQ4rqPRNKz1mKSFQK2Phmz3jGt9iYNjorJmVXV2cPXPaDTO8
+                            dFnJslFbzhTKM1h1K1JGprv+fT8c9A==
                         </ds:X509Certificate>
                     </ds:X509Data>
                 </ds:KeyInfo>
-                <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm" />
-                <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm" />
-                <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm" />
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc" />
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc" />
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc" />
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc" />
-                <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep" />
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p" />
+            </KeyDescriptor>
+            <KeyDescriptor use="encryption">
+                <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+                    <ds:KeyName>
+                        nesisemstestsc.nead.nebraska.edu
+                    </ds:KeyName>
+                    <ds:X509Data>
+                        <ds:X509SubjectName>
+                            CN=nesisemstestsc.nead.nebraska.edu
+                        </ds:X509SubjectName>
+                        <ds:X509Certificate>
+                            MIIEMjCCApqgAwIBAgIUJM81S28F4n4VV/N/uWUjhabECU4wDQYJKoZIhvcNAQEL
+                            BQAwKzEpMCcGA1UEAxMgbmVzaXNlbXN0ZXN0c2MubmVhZC5uZWJyYXNrYS5lZHUw
+                            HhcNMjQxMjA0MjEzMDM5WhcNMzQxMjAyMjEzMDM5WjArMSkwJwYDVQQDEyBuZXNp
+                            c2Vtc3Rlc3RzYy5uZWFkLm5lYnJhc2thLmVkdTCCAaIwDQYJKoZIhvcNAQEBBQAD
+                            ggGPADCCAYoCggGBAKq1qxNOpNadWmgqSUCHbROBBXbizxm5MSEHMkD4wyQDuRGG
+                            CVClUQmEkzEsXVn8ZodStxysebGzlOzdw29lgyjMf1q/ObBnvisoD7qWb3kxzu4g
+                            oa3tuwOx5fkVSb7f5mJfeZ/ZKIEOnrjPkx621UJ2ZRAdF2Fbm/TdeXwprRWj4Ftd
+                            YtG7Y4QbRxQeyAncXtJiq9HUSK12l6YwRgfxhSzhpCtrE3JhsNw8DWb70ZiYc7WD
+                            +P2COVOoKwyu0j4aROZnFIdtxk86FYnn3oHN6GOP618QoTurnj0Cip2vtdA5JwVU
+                            I+p+lqY30IKH2UgiTs/p7r50YwxwsEnhSAYIUQ+Nl0+DMQZxB93saIvttfbeeldC
+                            248GujvKpMd04hxCwrbtMHd9pJX9HjSWYzN8r9TKfA+2FnjTZVz/bO7epZ10QFD/
+                            q+eTZ0aBzWvtl4N0IZtLhTkDuIe7lg4TrmzpzussAIxuaYwX2ibZ87Zi3+hZv7QR
+                            vqVsxVWeOriOiADBLwIDAQABo04wTDArBgNVHREEJDAigiBuZXNpc2Vtc3Rlc3Rz
+                            Yy5uZWFkLm5lYnJhc2thLmVkdTAdBgNVHQ4EFgQUhwWhjuZMVC1xd1Kuc5G56x5H
+                            6DUwDQYJKoZIhvcNAQELBQADggGBAAJkNtGIHAhAF/06kLBrem3fMQFyyGSMMSjn
+                            I+OkfzNVCTJjkOcYA/LrCfO0IaJA8/5gyGRrIFsGFbN/RwB/EgyWoa3o6mgmJUAV
+                            YORseRybwJJ+EQnjIYzaEJk1BJ162wwVmudtvIUULX4KHfPuNvUIsY1L/rfxgqK8
+                            dUwMS6Y4IcPybg2rk/jsdM4y91ObBb5mDH9w94gDKuYzYY8b4tOsVd5r/sLVoovj
+                            1MpthU10HWZtt7uoRK7oKhOsZrC2tvh4M47GY+sGPb20+HP1gT127T84gIIV4eXH
+                            Bd6+Wni46JCGhtkVZyidQUA8Gm6M8xDd4Td73Rb2aF1YjQWmkO0shazCIrPEDzM1
+                            rVXSuQT40eFgfdAbQBrzQ+uIpkZkt5dCsQwPc/usiC33MrNDgUOyy/uLsHXN+geJ
+                            VKkn489h2qNvJ4Tq3ckcnLQN9shkoL9K4UhZOYRpLKbsCqScY0eJFNBXDeCgkLLb
+                            rC1WNej9nK02L4FzleNG0ERxOiVqFQ==
+                        </ds:X509Certificate>
+                    </ds:X509Data>
+                </ds:KeyInfo>
+                <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+                <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+                <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+                <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
             </KeyDescriptor>
             <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                Location="https://emststsc.nebraska.edu/Shibboleth.sso/Artifact/SOAP" index="1" />
+                Location="https://emststsc.nebraska.edu/Shibboleth.sso/Artifact/SOAP" index="1"/>
             <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SLO/SOAP" />
+                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SLO/SOAP"/>
             <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SLO/Redirect" />
+                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SLO/Redirect"/>
             <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SLO/POST" />
+                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SLO/POST"/>
             <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SLO/Artifact" />
+                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SLO/Artifact"/>
             <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SAML2/POST" index="1" />
-            <AssertionConsumerService
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
-                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SAML2/POST-SimpleSign"
-                index="2" />
+                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
             <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SAML2/Artifact" index="3" />
+                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
             <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"
-                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SAML2/ECP" index="4" />
+                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
             <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
-                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SAML/POST" index="5" />
+                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SAML/POST" index="5"/>
             <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"
-                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SAML/Artifact" index="6" />
+                Location="https://emststsc.nebraska.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
         </SPSSODescriptor>
         <Organization>
-            <OrganizationName xml:lang="en">EMS
-                Test Environment for State Colleges</OrganizationName>
-            <OrganizationDisplayName xml:lang="en">EMS Test Environment for State
-                Colleges</OrganizationDisplayName>
+            <OrganizationName xml:lang="en">
+                EMS Test Environment for State Colleges
+            </OrganizationName>
+            <OrganizationDisplayName xml:lang="en">
+                EMS Test Environment for State Colleges
+            </OrganizationDisplayName>
             <OrganizationURL xml:lang="en">
-                https://its.unl.edu/services/event-management-system/</OrganizationURL>
+                https://its.unl.edu/services/event-management-system/
+            </OrganizationURL>
         </Organization>
         <ContactPerson contactType="technical">
-            <GivenName>AMP
-                Tech Team</GivenName>
-            <EmailAddress>amptechnical@nebraska.edu</EmailAddress>
+            <GivenName>
+                Geoff Putney (AMP Tech Team)
+            </GivenName>
+            <EmailAddress>
+                amptechnical@nebraska.edu
+            </EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="administrative">
-            <GivenName>Frank
-                Dolezal (AMP Team)</GivenName>
-            <EmailAddress>fdolezal@nebraska.edu</EmailAddress>
+            <GivenName>
+                Frank Dolezal (AMP Team)
+            </GivenName>
+            <EmailAddress>
+                fdolezal@nebraska.edu
+            </EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
             <GivenName>NeSIS
-                Support Team</GivenName>
-            <EmailAddress>amp@nebraska.edu</EmailAddress>
+                Frank Dolezal (Support Team)
+            </GivenName>
+            <EmailAddress>
+                amp@nebraska.edu
+            </EmailAddress>
         </ContactPerson>
-        <ContactPerson contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-            <GivenName>ITS
-                Security</GivenName>
-            <EmailAddress>security@nebraska.edu</EmailAddress>
+        <ContactPerson contactType="other"
+                       remd:contactType="http://refeds.org/metadata/contactType/security">
+            <GivenName>
+                ITS Security
+            </GivenName>
+            <EmailAddress>
+                security@nebraska.edu
+            </EmailAddress>
         </ContactPerson>
-    </EntityDescriptor>
-    <EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_6473761aa99ab3f3853fa787bc3b54b34047e817" entityID="https://emsprdsc.nebraska.edu/shibboleth">
+    </EntityDescriptor>    
+    
+    <EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+                      ID="_6473761aa99ab3f3853fa787bc3b54b34047e817"
+                      entityID="https://emsprdsc.nebraska.edu/shibboleth">
         <Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
             <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512" />
             <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384" />