Am stuck on 20D, 5, 4
S-----/---B
The clue is Liquid (black) in small vault whence pong emanates
Could the second word be 'tomb'?
Also stuck on 25AC, (10)
Trouble after an invention puts of Tesla's foremost supporter
-------ADO
It can't be afficionado because it doesn't fit.
Your help appreciated as ever