Switch to longs.
Fixing offsets and access modifiers.