Updated Integer to offer a type IntegerValueType (=long), and use this everwhere the value type used to be hard coded as int
Updated spacing