Added TYPE enum

cvalue -> literalValue; getType returns TYPE enum
Changed ints around