* adding trigger short code injection * more annotation provider stuff * fixed up tests * Fix validator