Updated monitor and namecleaner