Clouded-bordered Brindle? and Pug

I think the first is a Clouded-bordered Brindle.

Re the pug - suprisingly obliging as in not flying off immediately.

 Catches still way down in numbers of moths and variety - is that other people's experience?  It seems year on year it's getting worse - and I've only been trapping since 2013.
 
Mark Griffiths, Garsington, Oxford