Fixed everything and added config