Updates to config and server