Fixed options and comments