Fixed Nagios core link in header, code cleanup
Updated TODO list