Changed types over to Int/UInt/8/16/32/64, etc.