options improvement (#4) + small fixes