Clean up cli options, add summary