config updates
Various updates