Updated config and added stuff