fixing some moretypoes. TODO: make batch_21 batch_22 like it really is