several changes to .config.*