Adds some matchers
Check array type; fix
Improved logging and reporting