a few fixes and added collectd input