fixed some bugs and added conf file
test