Changes suggested in weekly call

Chnage log failed, but I think that's ok.