fixed 1,2,3 - 7/14 issues