misc class7,cw1 updates
class 8, cw1 completed