Added conversions.
More generic arithmetic added.