added some missing options and comments