c1_hu and c2p1_hu updated from the indicator generator, also bugfixes in indicator_generator