Final changes

Based on feedback from 2014 training (class of 2013)