improve options (#4)