some improvements of substate system