stabilization and configuration improvements