updated through GF1 of ch2;; numbering almost completely fixed