Fix up options, comments