Updating with beta 3 changes

Mostly adding casts to CGFloat