Adding extra command line options and crystal self-calibration. WIP.