fixed some bugs
updated files