Converted some primitives: int to NSInteger and float to CGFloat, CGRect accessors now used