solved many issues from the list