Fixed bugs with table cells displaying old content
Changed int to NSInteger to maintain 32 and 64 bit capability
Merged from 64 bit version