Added config file + small fixes