Config in separate file, minor updates.