fixed some bugs
edit bugs