some cleanup and changed the way configurations are added