better logging plus a masterclient minor bug fix.