Added a short buffer type in addition to the byte buffers.
Stupid stupid stupid.
Self-review