Thanks for the additions. A couple of comments to improve your mapping if you're interested.
* You shouldn't put names on holes and fairways and greens and such unless the golf course has explicitly named them. You should just use a "ref=1" tag instead of "name=Fairway 1".
* If your fairway surrounds the green, you should select both objects (shift click) and right click to Merge them into what is called a multipolygon.

You can find more information at the golf_course wiki page: https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dgolf_course#Common_mapping_pitfalls
