add admin's final check & fix bug