Addresses #589 by adding units into the manual entry form.