Minor fixes and additions for latest update

7/11/13