New Nagios check and some bugfixes