updates for Oliver, trying to make everything a little more 64 bit-ish