add more options and fixed the last step missing bug