adjusted comments

adjusted comments, moved or spilt where required