updates to api
merged alex's and my changes to config files