Mixtures working again for Methane-Ethane, resolved some units problems

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>