fixes from 12/3/14 meeting