Updated to add nagios module.
Updates to a few files.