bugs in C1 fixed (hopefully)