Difficult I thought. For 16D I have a word for goodbye (and a single hoop of cereal I guess), but can't work out where the definition of the word is, just the component parts.
I'm also missing 20D but I'm going to have a look at golf terms on wikipedia I think once I've nipped to the shop.