fixed issues from review