fixed copy/paste bugs