...and more updates to config