improve options (#4) + many fixes