sprint 29 miscellany

@jrbl would you review please?  Just a few small things that have piled up in my "working" branch.