Add tokogae and domainvip, minor updates