More updates

Another round of updates. 

Peter