Bug fixed and confs added