Changes from 9/7/14 meeting

Fixes and changes from the 9/7/14 meeting