Just popped back to this and immediately got 22a - for whatever reason, I'd had it in my mind that "2s in the Church" was the definition and I never tackled it any other way.....doh!
Also got 24d (I should have seen earlier) which really only leaves one possible answer for 24a but I can't parse it.