Add direct conversions for US volume units; fix bad ml definition