config improvements