many changes
cleaned up use of int and float with CGFloat and NSInteger