added missing and simplified options