fixed some incosistencies on data conversion