support user-data defaults and various fixes