Big merge and some fixup from Ron Klinkien changes, thanks.