fix

fix former status bug, we should not recored prepare as former status
fix 'From' in makeTimeout