Changed short back to _int16. Need to fix this for xcode/visual studio cross compatibility.