Tao merge into Jon

Dust PDF/HTML Output Fix