fixed some bugs
changed files