fixed some bugs added some copy