many fix in work with modules & config