domains and apps - tuning and bug fixes