fix for html changes, and other small changes