#3 #4 fixup; runnable PC and Web tested.