add more options and fix doc