fixed some bugs, added path