Updated config to have more options. Still needs comments