domain name related changes + minor