(1) Patents are divided into independent claims and subordinate claims. If claim 2 is subordinate to claim 1, then claim 3 can be subordinate to claim 1 (estimated to be your current situation) or subordinate to claim 2. It is suggested to analyze who is responsible.
(2) It is said that only the correct statement can be changed, but the contents in the manual cannot be moved. It is suggested to use the opportunity of correction to correct it directly and see how the examiner handles it.
I hope it helps.