Updates to value conversion - plus crosslight moved in
Crosslight fixes