Solved in about 3 hours - tho was held up by getting some of the extra letters wrong. The theme is quite clever but some of the cluing is perverse - it's taken me till now to parse 14d tho it was obvious from the start what the answer was. It seems they aren't crediting the setter ... ?