Update three event handlers, minor mods in html