copy paste fix and more