updated long longs and NSUInteger to NSInteger