final -02, some changes per emails

deleted all comments, moved should to may for loop prevention and made
some small edits