Added config file, small bugs fix
fix