general system updates

On note we are rolling back the nps due to an issue they are currently resolving in regards to nginx.  The rest of the change log is as noted in commits