fixing cut/paste stuff