Fixed some unit conversions in state class - but some things are in SI and some are in the standard unit system which is getting problematic.  To be continued...

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