added some data and updated conf