more alignment and fix setting copy fields