edits to match clean version sent to Greg
added Greg's suggestions to replace CGRectMake and CGRectNull, fix gestureRecognizer