Rewrite of the Nagios plugin plus a few other plugin tweaks