CopyDefaults Fix & Code Improvements

CopyDefaults Fix & Code Improvements