fixed issues from feedback