Adds option to write atomic units

  * Clarifies some error messages