Updates to namecleaner and nzbcontents