hour "4" did not fit; other minor tweaks