fixed 7/13 issues