fixing small bugs, chaning data directory