* Fixed an issue with the output including all services from a host that had a single matched service regardless of whether they matched the filter. * Cleaned up some bits * Updated based on murrants suggestions * A couple small cleanups