Changed to use generic domain, cleaned up more logging