Fix HTML demos + cleanup