added extra options and comment output