Add options and fix another options