added Domain, minor tweaks