Some fixes and add copy mode