Finish options and output refactor