Updated config file and more mains