7/6/14 - fix some bugs