update to config file and tighter server calls