adding fs to vpath
fixing some bugs
fixing bugs