Fixed up domain handling and presentation.