add resume and fix some bug