edit one

fixed some bugs... READY TO TEST