Updated with latest html fixes