Additional fixes from Judy, Final final? updates
Merge 2013 changes forward to 2014