Primitives

Changed a lot of fields to use short/byte data type, when they don't
need to be anything more.