Fixes bug in shortFromBytes and changes enums to reflect new data structure from iOS