Added missing options (corrected some default values).