fixed copy and paste bugs